From 7900032f3067166502978413ed2447c68dc83771 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 11 Aug 2022 07:17:55 -0400 Subject: [PATCH] css: Propagate charset conversion errors Lets not throw away informtation that helps to figure out why things fail. --- gtk/css/gtkcssdataurl.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/gtk/css/gtkcssdataurl.c b/gtk/css/gtkcssdataurl.c index 6645b4835d..cc430378f2 100644 --- a/gtk/css/gtkcssdataurl.c +++ b/gtk/css/gtkcssdataurl.c @@ -152,13 +152,23 @@ gtk_css_data_url_parse (const char *url, gsize read; gsize written; gpointer data; + GError *local_error = NULL; data = g_convert_with_fallback (bdata, bsize, "UTF-8", charset, (char *) "*", - &read, &written, NULL); + &read, &written, &local_error); g_free (bdata); + if (local_error) + { + g_propagate_error (error, local_error); + g_free (charset); + g_free (data); + return NULL; + } + + bdata = data; bsize = written; } -- 2.30.2